From 41d4c375631d1e8bc9c47e1bc1846f6bf1fb17e5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 14 Oct 2020 19:05:36 -0400 Subject: [PATCH] atspi: Don't crash on unnamed stack pages GtkNotebook creates unnamed stack pages, and we should not crash when that happens. --- gtk/a11y/gtkatspicontext.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c index b6badc3beb..084c6a14be 100644 --- a/gtk/a11y/gtkatspicontext.c +++ b/gtk/a11y/gtkatspicontext.c @@ -568,9 +568,14 @@ handle_accessible_get_property (GDBusConnection *connection, if (GTK_IS_WIDGET (accessible)) res = g_variant_new_string (gtk_widget_get_name (GTK_WIDGET (accessible))); else if (GTK_IS_STACK_PAGE (accessible)) - res = g_variant_new_string (gtk_stack_page_get_name (GTK_STACK_PAGE (accessible))); + { + const char *name = gtk_stack_page_get_name (GTK_STACK_PAGE (accessible)); + if (name == NULL) + name = G_OBJECT_TYPE_NAME (accessible); + res = g_variant_new_string (name); + } else - res = g_variant_new_string ("Name"); + res = g_variant_new_string (G_OBJECT_TYPE_NAME (accessible)); } else if (g_strcmp0 (property_name, "Description") == 0) { -- 2.30.2